From bc057d849a9e83fe7c3b35a625dfb1e41b4c7394 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 29 Apr 2014 16:51:44 -0400
Subject: [PATCH] widget-factory: rearrange page 2 a bit

---
 demos/widget-factory/widget-factory.ui | 474 +++++++++++++------------
 1 file changed, 245 insertions(+), 229 deletions(-)

diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index 804556a47c..4aaefa16b1 100644
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -1860,319 +1860,335 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                   </object>
                 </child>
                 <child>
-                  <object class="GtkGrid" id="page2grid">
+                  <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="column-homogeneous">True</property>
-                    <property name="row-spacing">6</property>
-                    <property name="column-spacing">6</property>
+                    <property name="orientation">horizontal</property>
+                    <property name="spacing">10</property>
                     <property name="border-width">16</property>
                     <child>
-                      <object class="GtkBox" id="page2box1">
+                      <object class="GtkBox">
                         <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkSpinButton" id="verticalspin1">
-                            <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
-                            <property name="adjustment">adjustment2</property>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="verticalspin2">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
-                            <property name="orientation">vertical</property>
-                            <property name="adjustment">adjustment2</property>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkVolumeButton">
-                            <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
-                            <property name="valign">center</property>
-                            <property name="use-symbolic">True</property>
-                            <property name="value">.5</property>
-                            <property name="halign">center</property>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
-                        </child>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">10</property>
                         <child>
-                          <object class="GtkVolumeButton">
+                          <object class="GtkBox">
                             <property name="visible">True</property>
                             <property name="orientation">horizontal</property>
-                            <property name="valign">center</property>
-                            <property name="use-symbolic">True</property>
-                            <property name="value">.5</property>
-                            <property name="halign">center</property>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAspectFrame" id="panedframe1">
-                            <property name="visible">True</property>
-                            <property name="obey-child">False</property>
-                            <property name="ratio">1.0</property>
+                            <property name="spacing">6</property>
                             <child>
-                              <object class="GtkPaned">
+                              <object class="GtkSpinButton" id="verticalspin1">
                                 <property name="visible">True</property>
-                                <property name="orientation">horizontal</property>
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="visible">True</property>
-                                    <property name="label">Left</property>
-                                    <style>
-                                      <class name="view"/>
-                                    </style>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="visible">True</property>
-                                    <property name="label">Right</property>
-                                    <style>
-                                      <class name="view"/>
-                                    </style>
-                                  </object>
-                                </child>
+                                <property name="orientation">vertical</property>
+                                <property name="adjustment">adjustment2</property>
                               </object>
+                              <packing>
+                                <property name="expand">True</property>
+                              </packing>
                             </child>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAspectFrame" id="panedframe2">
-                            <property name="visible">True</property>
-                            <property name="obey-child">False</property>
-                            <property name="ratio">1.0</property>
                             <child>
-                              <object class="GtkPaned">
+                              <object class="GtkSpinButton" id="verticalspin2">
                                 <property name="visible">True</property>
+                                <property name="sensitive">False</property>
                                 <property name="orientation">vertical</property>
+                                <property name="adjustment">adjustment2</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkGrid">
+                                <property name="visible">True</property>
+                                <property name="row-spacing">6</property>
+                                <property name="column-spacing">6</property>
+                                <property name="valign">center</property>
                                 <child>
-                                  <object class="GtkLabel">
+                                  <object class="GtkVolumeButton">
                                     <property name="visible">True</property>
-                                    <property name="label">Top</property>
-                                    <style>
-                                      <class name="view"/>
-                                    </style>
+                                    <property name="orientation">vertical</property>
+                                    <property name="valign">center</property>
+                                    <property name="use-symbolic">True</property>
+                                    <property name="value">.5</property>
+                                    <property name="halign">center</property>
                                   </object>
+                                  <packing>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">0</property>
+                                  </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkLabel">
+                                  <object class="GtkVolumeButton">
                                     <property name="visible">True</property>
-                                    <property name="label">Bottom</property>
-                                    <style>
-                                      <class name="view"/>
-                                    </style>
+                                    <property name="orientation">horizontal</property>
+                                    <property name="valign">center</property>
+                                    <property name="use-symbolic">True</property>
+                                    <property name="value">.5</property>
+                                    <property name="halign">center</property>
                                   </object>
+                                  <packing>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">1</property>
+                                  </packing>
                                 </child>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="filler2">
-                        <property name="visible">True</property>
-                      </object>
-                      <packing>
-                        <property name="left-attach">2</property>
-                        <property name="top-attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkFrame" id="frame">
-                        <property name="visible">True</property>
-                        <property name="hexpand">False</property>
-                        <child>
-                          <object class="GtkBox">
-                            <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="GtkActionBar" id="actionbar1">
-                                <property name="visible">True</property>
-                                <child type="center">
-                                  <object class="GtkStackSwitcher" id="switcher">
+                                <child>
+                                  <object class="GtkMenuButton">
                                     <property name="visible">True</property>
-                                    <property name="stack">stack</property>
+                                    <property name="menu-model">dinner_menu</property>
                                     <property name="halign">center</property>
+                                    <property name="valign">center</property>
+                                    <child>
+                                      <object class="GtkImage">
+                                        <property name="visible">True</property>
+                                        <property name="icon-name">document-open-recent-symbolic</property>
+                                        <property name="icon-size">4</property>
+                                      </object>
+                                    </child>
                                   </object>
+                                  <packing>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">0</property>
+                                  </packing>
                                 </child>
                               </object>
+                              <packing>
+                                <property name="expand">True</property>
+                              </packing>
                             </child>
                             <child>
-                              <object class="GtkStack" id="stack">
+                              <object class="GtkAspectFrame" id="panedframe1">
                                 <property name="visible">True</property>
-                                <property name="transition-type">crossfade</property>
-                                <property name="transition-duration">1000</property>
+                                <property name="obey-child">False</property>
+                                <property name="ratio">1.0</property>
                                 <child>
-                                  <object class="GtkScrolledWindow" id="swo">
+                                  <object class="GtkPaned">
                                     <property name="visible">True</property>
-                                    <property name="shadow-type">none</property>
-                                    <property name="hscrollbar_policy">never</property>
+                                    <property name="orientation">horizontal</property>
                                     <child>
-                                      <object class="GtkTextView" id="tvo">
+                                      <object class="GtkLabel">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="buffer">textbuffer2</property>
+                                        <property name="label">Left</property>
+                                        <style>
+                                          <class name="view"/>
+                                        </style>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="visible">True</property>
+                                        <property name="label">Right</property>
+                                        <style>
+                                          <class name="view"/>
+                                        </style>
                                       </object>
                                     </child>
                                   </object>
-                                  <packing>
-                                    <property name="name">page1</property>
-                                    <property name="icon-name">document-open-recent-symbolic</property>
-                                    <property name="title">News</property>
-                                  </packing>
                                 </child>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkAspectFrame" id="panedframe2">
+                                <property name="visible">True</property>
+                                <property name="obey-child">False</property>
+                                <property name="ratio">1.0</property>
                                 <child>
-                                  <object class="GtkImage" id="imageo">
+                                  <object class="GtkPaned">
                                     <property name="visible">True</property>
-                                    <property name="icon-name">gtk3-widget-factory</property>
-                                    <property name="pixel-size">256</property>
+                                    <property name="orientation">vertical</property>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="visible">True</property>
+                                        <property name="label">Top</property>
+                                        <style>
+                                          <class name="view"/>
+                                        </style>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="visible">True</property>
+                                        <property name="label">Bottom</property>
+                                        <style>
+                                          <class name="view"/>
+                                        </style>
+                                      </object>
+                                    </child>
                                   </object>
-                                  <packing>
-                                    <property name="name">page2</property>
-                                    <property name="icon-name">system-shutdown-symbolic</property>
-                                    <property name="title">Logo</property>
-                                  </packing>
                                 </child>
                               </object>
+                              <packing>
+                                <property name="expand">True</property>
+                              </packing>
                             </child>
                           </object>
                         </child>
-                      </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkFrame">
-                        <property name="visible">True</property>
                         <child>
-                          <object class="GtkListBox" id="listbox">
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="orientation">horizontal</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkFrame" id="frame">
                             <property name="visible">True</property>
-                            <property name="selection-mode">none</property>
+                            <property name="hexpand">False</property>
                             <child>
-                              <object class="GtkBox" id="listboxrow1">
+                              <object class="GtkBox">
                                 <property name="visible">True</property>
-                                <property name="orientation">horizontal</property>
+                                <property name="orientation">vertical</property>
                                 <child>
-                                  <object class="GtkLabel">
+                                  <object class="GtkActionBar" id="actionbar1">
                                     <property name="visible">True</property>
-                                    <property name="label">Row 1</property>
-                                    <property name="halign">start</property>
-                                    <property name="margin">6</property>
+                                    <child type="center">
+                                      <object class="GtkStackSwitcher" id="switcher">
+                                        <property name="visible">True</property>
+                                        <property name="stack">stack</property>
+                                        <property name="halign">center</property>
+                                      </object>
+                                    </child>
                                   </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                  </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkSwitch">
+                                  <object class="GtkStack" id="stack">
                                     <property name="visible">True</property>
-                                    <property name="margin">6</property>
+                                    <property name="transition-type">crossfade</property>
+                                    <property name="transition-duration">1000</property>
+                                    <child>
+                                      <object class="GtkScrolledWindow" id="swo">
+                                        <property name="visible">True</property>
+                                        <property name="shadow-type">none</property>
+                                        <property name="hscrollbar_policy">never</property>
+                                        <child>
+                                          <object class="GtkTextView" id="tvo">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="buffer">textbuffer2</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="name">page1</property>
+                                        <property name="icon-name">document-open-recent-symbolic</property>
+                                        <property name="title">News</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkImage" id="imageo">
+                                        <property name="visible">True</property>
+                                        <property name="icon-name">gtk3-widget-factory</property>
+                                        <property name="pixel-size">256</property>
+                                      </object>
+                                      <packing>
+                                        <property name="name">page2</property>
+                                        <property name="icon-name">system-shutdown-symbolic</property>
+                                        <property name="title">Logo</property>
+                                      </packing>
+                                    </child>
                                   </object>
                                 </child>
                               </object>
                             </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="orientation">horizontal</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkFrame">
+                            <property name="visible">True</property>
                             <child>
-                              <object class="GtkBox" id="listboxrow2">
+                              <object class="GtkListBox" id="listbox">
                                 <property name="visible">True</property>
-                                <property name="orientation">horizontal</property>
+                                <property name="selection-mode">none</property>
                                 <child>
-                                  <object class="GtkLabel">
+                                  <object class="GtkBox" id="listboxrow1">
                                     <property name="visible">True</property>
-                                    <property name="label">Row 2</property>
-                                    <property name="halign">start</property>
-                                    <property name="margin">6</property>
+                                    <property name="orientation">horizontal</property>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="visible">True</property>
+                                        <property name="label">Row 1</property>
+                                        <property name="halign">start</property>
+                                        <property name="margin">6</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkSwitch">
+                                        <property name="visible">True</property>
+                                        <property name="margin">6</property>
+                                      </object>
+                                    </child>
                                   </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                  </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkScale">
-                                    <property name="orientation">horizontal</property>
+                                  <object class="GtkBox" id="listboxrow2">
                                     <property name="visible">True</property>
-                                    <property name="margin">6</property>
-                                    <property name="draw-value">False</property>
-                                    <property name="width-request">150</property>
-                                    <property name="adjustment">adjustment1</property>
+                                    <property name="orientation">horizontal</property>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="visible">True</property>
+                                        <property name="label">Row 2</property>
+                                        <property name="halign">start</property>
+                                        <property name="margin">6</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkScale">
+                                        <property name="orientation">horizontal</property>
+                                        <property name="visible">True</property>
+                                        <property name="margin">6</property>
+                                        <property name="draw-value">False</property>
+                                        <property name="width-request">150</property>
+                                        <property name="adjustment">adjustment1</property>
+                                      </object>
+                                    </child>
                                   </object>
                                 </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkBox" id="listboxrow3">
-                                <property name="visible">True</property>
-                                <property name="orientation">horizontal</property>
                                 <child>
-                                  <object class="GtkLabel">
+                                  <object class="GtkBox" id="listboxrow3">
                                     <property name="visible">True</property>
-                                    <property name="label">Row 3</property>
-                                    <property name="halign">start</property>
-                                    <property name="margin">6</property>
+                                    <property name="orientation">horizontal</property>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="visible">True</property>
+                                        <property name="label">Row 3</property>
+                                        <property name="halign">start</property>
+                                        <property name="margin">6</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                      </packing>
+                                    </child>
                                   </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                  </packing>
                                 </child>
                               </object>
                             </child>
                           </object>
                         </child>
                       </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">3</property>
-                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSeparator">
+                        <property name="visible">True</property>
+                        <property name="orientation">vertical</property>
+                      </object>
                     </child>
                     <child>
                       <object class="GtkBox">
                         <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
-                        <child>
-                          <object class="GtkMenuButton">
-                            <property name="visible">True</property>
-                            <property name="menu-model">dinner_menu</property>
-                            <property name="halign">center</property>
-                            <property name="valign">center</property>
-                            <child>
-                              <object class="GtkImage">
-                                <property name="visible">True</property>
-                                <property name="icon-name">document-open-recent-symbolic</property>
-                                <property name="icon-size">4</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
+                        <property name="orientation">vertical</property>
                       </object>
-                      <packing>
-                        <property name="left-attach">1</property>
-                        <property name="top-attach">0</property>
-                      </packing>
                     </child>
                   </object>
                 </child>
-- 
2.30.2